home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
IRIX Base Documentation 1998 November
/
IRIX 6.5.2 Base Documentation November 1998.img
/
usr
/
share
/
catman
/
u_man
/
cat1
/
sdiff.z
/
sdiff
Wrap
Text File
|
1998-10-20
|
4KB
|
133 lines
SSSSDDDDIIIIFFFFFFFF((((1111)))) SSSSDDDDIIIIFFFFFFFF((((1111))))
NNNNAAAAMMMMEEEE
sdiff - side-by-side difference program
SSSSYYYYNNNNOOOOPPPPSSSSIIIISSSS
ssssddddiiiiffffffff [ options ... ] file1 file2
DDDDEEEESSSSCCCCRRRRIIIIPPPPTTTTIIIIOOOONNNN
_s_d_i_f_f uses the output of _d_i_f_f(1) to produce a side-by-side listing of two
files indicating those lines that are different. Each line of the two
files is printed with a blank gutter between them if the lines are
identical, a <<<< in the gutter if the line only exists in _f_i_l_e_1, a >>>> in the
gutter if the line only exists in _f_i_l_e_2, and a |||| for lines that are
different.
For example:
x | y
a a
b <
c <
d d
> c
The following options exist:
----wwww _n Use the next argument, _n, as the width of the output line.
The default line length is 130 characters.
----llll Only print the left side of any lines that are identical.
----ssss Do not print identical lines.
----oooo _o_u_t_p_u_t Use the next argument, _o_u_t_p_u_t, as the name of a third file
that is created as a user-controlled merging of _f_i_l_e_1 and
_f_i_l_e_2. Identical lines of _f_i_l_e_1 and _f_i_l_e_2 are copied to
_o_u_t_p_u_t. Sets of differences, as produced by _d_i_f_f(1), are
printed; where a set of differences share a common gutter
character. After printing each set of differences, _s_d_i_f_f
prompts the user with a %%%% and waits for one of the following
user-typed commands:
llll append the left column to the output file
rrrr append the right column to the output file
ssss turn on silent mode; do not print identical lines
vvvv turn off silent mode
eeee llll call the editor with the left column
PPPPaaaaggggeeee 1111
SSSSDDDDIIIIFFFFFFFF((((1111)))) SSSSDDDDIIIIFFFFFFFF((((1111))))
eeee rrrr call the editor with the right column
eeee bbbb call the editor with the concatenation of left
and right
eeee call the editor with a zero length file
qqqq exit from the program
On exit from the editor, the resulting file is concatenated on
the end of the _o_u_t_p_u_t file.
SSSSEEEEEEEE AAAALLLLSSSSOOOO
diff(1), ed(1).
PPPPaaaaggggeeee 2222